From e9b81a1c6c290608a2c9107a2af8930af45c295d Mon Sep 17 00:00:00 2001 From: =?utf8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 18 Dec 2017 15:06:57 +0100 Subject: [PATCH] =?utf8?q?Fix=20:=20libdir=20for=20autotools=20and=20meson?= =?utf8?q?=20are=20not=20the=20same=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- babl/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/babl/meson.build b/babl/meson.build index a46a7f5..b3058cc 100644 --- a/babl/meson.build +++ b/babl/meson.build @@ -81,8 +81,8 @@ install_headers(babl_headers, babl = library(lib_name, babl_sources, include_directories: [ rootInclude, bablBaseInclude], - c_args: [ '-DLIBDIR="' + get_option('libdir') + '"', ], - cpp_args: [ '-DLIBDIR="' + get_option('libdir') + '"', ], + c_args: [ '-DLIBDIR="' + join_paths(get_option('prefix'), get_option('libdir')) + '"', ], + cpp_args: [ '-DLIBDIR="' + join_paths(get_option('prefix'), get_option('libdir')) + '"', ], link_with: [ babl_base, ], link_args: [ '-Wl,--version-script,' + version_script, ], dependencies: [ math, thread, dl, ], -- 2.30.2